Merge branch 'olsrd'
authorJo-Philipp Wich <[email protected]>
Thu, 18 Apr 2013 16:49:01 +0000 (18:49 +0200)
committerJo-Philipp Wich <[email protected]>
Thu, 18 Apr 2013 16:49:01 +0000 (18:49 +0200)

Trivial merge